From 01e6811776cf6ad8738f182972edbb84626d7fae Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 21 Oct 2014 15:36:22 +0200
Subject: [PATCH] Adwaita: axes borders of notebooks inside frame

This is what the old adwaita did, not having a better solution for
removing double borders, better to have this back even if it can
be problematic in certain cases.
---
 gtk/resources/theme/Adwaita/_common.scss           | 5 ++++-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 2 ++
 gtk/resources/theme/Adwaita/gtk-contained.css      | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index e7905b5d21..eb9c5d6fd7 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1564,9 +1564,9 @@ column-header.button.dnd { // for treeview-like derive widgets
     &.left { border-left-width: 0; }
     &:backdrop { border-color: $backdrop_borders_color; }
   }
+
   &.header {
     // FIXME: double borders in some case, can't fix it w/o a class tho
-    // FIXME: doesn't work on dark var
     background-color: mix($bg_color, $borders_color, 70%);
 
     // this is the shading of the header behind the tabs
@@ -1606,6 +1606,9 @@ column-header.button.dnd { // for treeview-like derive widgets
       box-shadow: none;
     }
   }
+
+  .frame > &.frame { border: none; } // axes borders when the notebook is inside a frame
+
   tab {
     border-width: 0;
     border-style: solid;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 47dd882849..7e1d72c4e8 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -2248,6 +2248,8 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
     .notebook.header:backdrop {
       background-color: #2f3434;
       box-shadow: none; }
+  .frame > .notebook.frame {
+    border: none; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 0d4c33e9ce..9c5c811b7f 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -2245,6 +2245,8 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
     .notebook.header:backdrop {
       background-color: #d4d4d4;
       box-shadow: none; }
+  .frame > .notebook.frame {
+    border: none; }
   .notebook tab {
     border-width: 0;
     border-style: solid;
-- 
2.30.2